Auto merge of #1651 - Roysten:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 26 May 2015 20:05:48 +0000 (20:05 +0000)
committerbors <bors@rust-lang.org>
Tue, 26 May 2015 20:05:48 +0000 (20:05 +0000)

Trivial merge